From f9d2dae496ea8602c3b3573e7d203eddc6decd36 Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Thu, 1 Feb 2007 15:31:34 +0000 Subject: [PATCH] Fix merge conflict between new HVM console handling and new HVM boot handling. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/server/vfbif.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/python/xen/xend/server/vfbif.py b/tools/python/xen/xend/server/vfbif.py index 0bd1b92bf3..fb510de25f 100644 --- a/tools/python/xen/xend/server/vfbif.py +++ b/tools/python/xen/xend/server/vfbif.py @@ -46,7 +46,7 @@ class VfbifController(DevController): def createDevice(self, config): DevController.createDevice(self, config) - if self.vm.info.get('HVM_boot'): + if self.vm.info.get('HVM_boot_policy'): # is HVM, so qemu-dm will handle the vfb. return @@ -90,7 +90,7 @@ class VfbifController(DevController): def waitForDevice(self, devid): - if self.vm.info.get('HVM_boot'): + if self.vm.info.get('HVM_boot_policy'): log.debug('skip waiting for HVM vfb') # is a qemu-dm managed device, don't wait for hotplug for these. return @@ -110,7 +110,7 @@ class VfbifController(DevController): raise VmError('Refusing to reconfigure device vfb:%d' % devid) def destroyDevice(self, devid, force): - if self.vm.info.get('HVM_boot'): + if self.vm.info.get('HVM_boot_policy'): # remove the backend xenstore entries for HVM guests no matter # what DevController.destroyDevice(self, devid, True) @@ -119,7 +119,7 @@ class VfbifController(DevController): def migrate(self, deviceConfig, network, dst, step, domName): - if self.vm.info.get('HVM_boot'): + if self.vm.info.get('HVM_boot_policy'): return 0 return DevController.migrate(self, deviceConfig, network, dst, step, domName) @@ -136,14 +136,14 @@ class VkbdifController(DevController): return (devid, back, front) def waitForDevice(self, config): - if self.vm.info.get('HVM_boot'): + if self.vm.info.get('HVM_boot_policy'): # is a qemu-dm managed device, don't wait for hotplug for these. return DevController.waitForDevice(self, config) def destroyDevice(self, devid, force): - if self.vm.info.get('HVM_boot'): + if self.vm.info.get('HVM_boot_policy'): # remove the backend xenstore entries for HVM guests no matter # what DevController.destroyDevice(self, devid, True) @@ -151,7 +151,7 @@ class VkbdifController(DevController): DevController.destroyDevice(self, devid, force) def migrate(self, deviceConfig, network, dst, step, domName): - if self.vm.info.get('HVM_boot'): + if self.vm.info.get('HVM_boot_policy'): return 0 return DevController.migrate(self, deviceConfig, network, dst, step, domName) -- 2.30.2